Autogenerated HTML docs for v1.8.2.1-501-gd2949
diff --git a/RelNotes/1.8.3.txt b/RelNotes/1.8.3.txt index 5031abf..7799cec 100644 --- a/RelNotes/1.8.3.txt +++ b/RelNotes/1.8.3.txt
@@ -24,7 +24,10 @@ important for those who are used to "git add -u" (without pathspec) updating the index only for paths in the current subdirectory to start training their fingers to explicitly say "git add -u ." when they mean -it before Git 2.0 comes. +it before Git 2.0 comes. A warning is issued when these commands are +run without a pathspec and when you have local changes outside the +current directory, because the behaviour in Git 2.0 will be different +from today's version in such a situation. Updates since v1.8.2 @@ -32,6 +35,17 @@ UI, Workflows & Features + * "git branch --vv" learned to paint the name of the branch it + integrates with in a different color (color.branch.upstream, + which defaults to blue). + + * "git count-objects" learned "--human-readable" aka "-H" option to + show various large numbers in Ki/Mi/GiB scaled as necessary. + + * "git cherry-pick $blob" and "git cherry-pick $tree" are nonsense, + and a more readable error message e.g. "can't cherry-pick a tree" + is given (we used to say "expected exactly one commit"). + * The "--annotate" option to "git send-email" can be turned on (or off) by default with sendemail.annotate configuration variable (you can use --no-annotate from the command line to override it). @@ -178,6 +192,18 @@ track are contained in this release (see release notes to them for details). + * When "upload-pack" fails while generating a pack in response to + "git fetch" (or "git clone"), the receiving side mistakenly said + there was a programming error to trigger the die handler + recursively. + (merge 1ece66b jk/a-thread-only-dies-once later to maint). + + * "rev-list --stdin" and friends kept bogus pointers into input + buffer around as human readble object names. This was not a huge + problem but was exposed by a new change that uses these names in + error output. + (merge 70d26c6 tr/copy-revisions-from-stdin later to maint). + * Smart-capable HTTP servers were not restricted via the GIT_NAMESPACE mechanism when talking with commit-walker clients, like they do when talking with smart HTTP clients.
diff --git a/config.txt b/config.txt index 42b0f3b..29559c8 100644 --- a/config.txt +++ b/config.txt
@@ -807,7 +807,8 @@ color.branch.<slot>:: Use customized color for branch coloration. `<slot>` is one of `current` (the current branch), `local` (a local branch), - `remote` (a remote-tracking branch in refs/remotes/), `plain` (other + `remote` (a remote-tracking branch in refs/remotes/), + `upstream` (upstream tracking branch), `plain` (other refs). + The value for these configuration variables is a list of colors (at most @@ -1465,6 +1466,14 @@ with when fetching or pushing over HTTPS. Can be overridden by the 'GIT_SSL_CAPATH' environment variable. +http.sslTry:: + Attempt to use AUTH SSL/TLS and encrypted data transfers + when connecting via regular FTP protocol. This might be needed + if the FTP server requires it for security reasons or you wish + to connect securely whenever remote FTP server supports it. + Default is false since it might trigger certificate verification + errors on misconfigured servers. + http.maxRequests:: How many HTTP requests to launch in parallel. Can be overridden by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
diff --git a/git-config.html b/git-config.html index 1479c9f..79cb588 100644 --- a/git-config.html +++ b/git-config.html
@@ -2455,7 +2455,8 @@ <p> Use customized color for branch coloration. <code><slot></code> is one of <code>current</code> (the current branch), <code>local</code> (a local branch), - <code>remote</code> (a remote-tracking branch in refs/remotes/), <code>plain</code> (other + <code>remote</code> (a remote-tracking branch in refs/remotes/), + <code>upstream</code> (upstream tracking branch), <code>plain</code> (other refs). </p> <div class="paragraph"><p>The value for these configuration variables is a list of colors (at most @@ -4186,6 +4187,19 @@ </p> </dd> <dt class="hdlist1"> +http.sslTry +</dt> +<dd> +<p> + Attempt to use AUTH SSL/TLS and encrypted data transfers + when connecting via regular FTP protocol. This might be needed + if the FTP server requires it for security reasons or you wish + to connect securely whenever remote FTP server supports it. + Default is false since it might trigger certificate verification + errors on misconfigured servers. +</p> +</dd> +<dt class="hdlist1"> http.maxRequests </dt> <dd>
diff --git a/git-count-objects.html b/git-count-objects.html index 6684af4..d901191 100644 --- a/git-count-objects.html +++ b/git-count-objects.html
@@ -746,7 +746,7 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>git count-objects</em> [-v]</pre> +<pre class="content"><em>git count-objects</em> [-v] [-H | --human-readable]</pre> <div class="attribution"> </div></div> </div> @@ -773,14 +773,26 @@ Report in more detail: </p> <div class="paragraph"><p>count: the number of loose objects</p></div> -<div class="paragraph"><p>size: disk space consumed by loose objects, in KiB</p></div> +<div class="paragraph"><p>size: disk space consumed by loose objects, in KiB (unless -H is specified)</p></div> <div class="paragraph"><p>in-pack: the number of in-pack objects</p></div> -<div class="paragraph"><p>size-pack: disk space consumed by the packs, in KiB</p></div> +<div class="paragraph"><p>size-pack: disk space consumed by the packs, in KiB (unless -H is specified)</p></div> <div class="paragraph"><p>prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using <code>git prune-packed</code>.</p></div> <div class="paragraph"><p>garbage: the number of files in object database that are not valid loose objects nor valid packs</p></div> -<div class="paragraph"><p>size-garbage: disk space consumed by garbage files, in KiB</p></div> +<div class="paragraph"><p>size-garbage: disk space consumed by garbage files, in KiB (unless -H is +specified)</p></div> +</dd> +<dt class="hdlist1"> +-H +</dt> +<dt class="hdlist1"> +--human-readable +</dt> +<dd> +<p> +Print sizes in human readable format +</p> </dd> </dl></div> </div> @@ -795,7 +807,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-21 15:47:21 PDT +Last updated 2013-04-19 14:26:26 PDT </div> </div> </body>
diff --git a/git-count-objects.txt b/git-count-objects.txt index da6e72e..b300e84 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- [verse] -'git count-objects' [-v] +'git count-objects' [-v] [-H | --human-readable] DESCRIPTION ----------- @@ -24,11 +24,11 @@ + count: the number of loose objects + -size: disk space consumed by loose objects, in KiB +size: disk space consumed by loose objects, in KiB (unless -H is specified) + in-pack: the number of in-pack objects + -size-pack: disk space consumed by the packs, in KiB +size-pack: disk space consumed by the packs, in KiB (unless -H is specified) + prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`. @@ -36,7 +36,13 @@ garbage: the number of files in object database that are not valid loose objects nor valid packs + -size-garbage: disk space consumed by garbage files, in KiB +size-garbage: disk space consumed by garbage files, in KiB (unless -H is +specified) + +-H:: +--human-readable:: + +Print sizes in human readable format GIT ---
diff --git a/technical/api-strbuf.html b/technical/api-strbuf.html index 5c344c6..79e03b2 100644 --- a/technical/api-strbuf.html +++ b/technical/api-strbuf.html
@@ -1120,6 +1120,15 @@ </p> </dd> <dt class="hdlist1"> +<code>strbuf_humanise_bytes</code> +</dt> +<dd> +<p> + Append the given byte size as a human-readable string (i.e. 12.23 KiB, + 3.50 MiB). +</p> +</dd> +<dt class="hdlist1"> <code>strbuf_addf</code> </dt> <dd> @@ -1273,7 +1282,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-04 11:21:45 PST +Last updated 2013-04-19 14:26:26 PDT </div> </div> </body>
diff --git a/technical/api-strbuf.txt b/technical/api-strbuf.txt index 2c59cb2..3350d97 100644 --- a/technical/api-strbuf.txt +++ b/technical/api-strbuf.txt
@@ -230,6 +230,11 @@ destination. This is useful for literal data to be fed to either strbuf_expand or to the *printf family of functions. +`strbuf_humanise_bytes`:: + + Append the given byte size as a human-readable string (i.e. 12.23 KiB, + 3.50 MiB). + `strbuf_addf`:: Add a formatted string to the buffer.
